Skip to content

venv.po, unicode.po, datastructures.po complete#917

Merged
awecx merged 27 commits into
python:3.8from
drNymbus:venv
Dec 29, 2019
Merged

venv.po, unicode.po, datastructures.po complete#917
awecx merged 27 commits into
python:3.8from
drNymbus:venv

Conversation

@drNymbus

@drNymbus drNymbus commented Oct 31, 2019

Copy link
Copy Markdown
Contributor

No description provided.

Seluj78
Seluj78 requested changes Oct 31, 2019
View reviewed changes

@Seluj78 Seluj78 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merci pour cette review ! 🎉

Comment thread reference/expressions.po Outdated
Comment thread tutorial/datastructures.po Outdated
Comment thread tutorial/datastructures.po Outdated
Comment thread tutorial/datastructures.po Outdated
drNymbus and others added 4 commits November 1, 2019 13:51
@drNymbus @Seluj78
Update reference/expressions.po
5f3df63 
Co-Authored-By: Jules Lasne (jlasne) <jlasne@student.42.fr>
@drNymbus @Seluj78
Update tutorial/datastructures.po
b3a6633 
Co-Authored-By: Jules Lasne (jlasne) <jlasne@student.42.fr>
@drNymbus @Seluj78
Update tutorial/datastructures.po
581c9b8 
Co-Authored-By: Jules Lasne (jlasne) <jlasne@student.42.fr>
@drNymbus @Seluj78
Update tutorial/datastructures.po
482b368 
Co-Authored-By: Jules Lasne (jlasne) <jlasne@student.42.fr>
christopheNan
christopheNan previously requested changes Nov 1, 2019
View reviewed changes

@christopheNan christopheNan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quelques petits points et c'est bon.

Comment thread tutorial/datastructures.po Outdated
Comment thread tutorial/datastructures.po Outdated
Comment thread tutorial/venv.po Outdated
Comment thread tutorial/venv.po Outdated
awecx
awecx suggested changes Nov 5, 2019
View reviewed changes

@awecx awecx left a comment •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merci pour cette PR.
Pour tes futures contributions, n'hésite pas à faire une PR par fichier (même pour quelques lignes).
C'est plus lisible est cela permet de merger plus rapidement.

Comment thread tutorial/venv.po Outdated
Comment thread tutorial/venv.po Outdated
Comment thread tutorial/venv.po Outdated
Comment thread reference/expressions.po Outdated
Comment thread reference/expressions.po Outdated
@deronnax

deronnax commented Nov 5, 2019

Copy link
Copy Markdown
Collaborator

Merci pour cette PR.
Pour tes futures contributions, n'hésite pas à faire une par fichier (même pour quelques lignes).
C'est plus lisible est cela permet de merger plus rapidement.

(c'est un peu ma faute, je lui ai dit trop tard de faire des PR séparées)

drNymbus and others added 8 commits November 7, 2019 14:09
@drNymbus @christopheNan
Update tutorial/datastructures.po
11efa21 
Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com>
@drNymbus @christopheNan
Update tutorial/datastructures.po
f895eda 
Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com>
@drNymbus @christopheNan
Update tutorial/venv.po
ce5bd88 
Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com>
@drNymbus @christopheNan
Update tutorial/venv.po
a4e33ab 
Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com>
@drNymbus @awecx
Update tutorial/venv.po
2b8ae0e 
Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com>
@drNymbus @awecx
Update tutorial/venv.po
e4318f2 
Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com>
@drNymbus @awecx
Update reference/expressions.po
24ac8f5 
Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com>
@drNymbus @awecx
Update reference/expressions.po
f2b95f1 
Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com>
@Seluj78 Seluj78 added NEED REVIEWER This PR needs a reviewer :) awaiting changes and removed awaiting changes NEED REVIEWER This PR needs a reviewer :) labels Nov 15, 2019
@Seluj78

Seluj78 commented Nov 17, 2019

Copy link
Copy Markdown
Collaborator

@drNymbus il faut que tu résoude les conflits dans github ou alors que tu ailles dans ta cmdline sur la bonne branche, mets a jour ton upstream avec git fetch upstream puis git rebase upstream/3.8, résouds les conflits puis git push --force

@Seluj78 Seluj78 self-assigned this Dec 11, 2019
@Seluj78 Seluj78 self-requested a review December 11, 2019 15:02
@Seluj78

Seluj78 commented Dec 27, 2019

Copy link
Copy Markdown
Collaborator

ping @drNymbus 🏓

@drNymbus

drNymbus commented Dec 27, 2019

Copy link
Copy Markdown
Contributor Author

Merci infiniment de votre patience ! Du coup je viens de régler les conflits, il me reste seulement a passer le powrap, il me dit que certains espaces doivent êtres insecables, j'ai alors rajouté ces espaces mais rien ne se passe... une idée ?

@awecx

awecx commented Dec 27, 2019

Copy link
Copy Markdown

Merci infiniment de votre patience ! Du coup je viens de régler les conflits, il me reste seulement a passer le powrap, il me dit que certains espaces doivent êtres insecables, j'ai alors rajouté ces espaces mais rien ne se passe... une idée ?

Ce n'est pas powrap qui te dit ça, mais padpo, un outil encore en béta qui donne des indications supplémentaires.

Powrap te demande seulement de réindenter expressions.po (l.333 de la sortie Travis).

@Seluj78

Seluj78 commented Dec 28, 2019

Copy link
Copy Markdown
Collaborator

@drNymbus -> @vmelancon same same ?

Seluj78
Seluj78 reviewed Dec 28, 2019
View reviewed changes
Comment thread reference/expressions.po Outdated
Seluj78
Seluj78 reviewed Dec 28, 2019
View reviewed changes
Comment thread reference/expressions.po Outdated
Seluj78
Seluj78 reviewed Dec 28, 2019
View reviewed changes
Comment thread tutorial/datastructures.po Outdated
Seluj78
Seluj78 reviewed Dec 28, 2019
View reviewed changes
Comment thread tutorial/datastructures.po Outdated
Seluj78
Seluj78 reviewed Dec 28, 2019
View reviewed changes
Comment thread tutorial/datastructures.po Outdated
Seluj78
Seluj78 previously requested changes Dec 28, 2019
View reviewed changes

@Seluj78 Seluj78 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good à part les modifications sur les espaces insécables sur la doc originale

awecx
awecx suggested changes Dec 29, 2019
View reviewed changes

@awecx awecx left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Encore une modification et ça sera bon.

Comment thread tutorial/datastructures.po Outdated
drNymbus and others added 2 commits December 29, 2019 18:48
@drNymbus @awecx
Update tutorial/datastructures.po
996529c 
Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com>
@awecx
"Revert" unchanged file.
385680d
awecx
awecx approved these changes Dec 29, 2019
View reviewed changes

@awecx awecx left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:1:

@awecx awecx dismissed stale reviews from Seluj78 and christopheNan December 29, 2019 18:02

Modifications demandées corrigées.

@awecx awecx merged commit 4a74866 into python:3.8 Dec 29, 2019
@awecx

awecx commented Dec 29, 2019

Copy link
Copy Markdown

Bon travail @drNymbus !
N'hésite pas à reprendre un fichier si tu le souhaites 😃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Seluj78 Seluj78 Seluj78 left review comments
+2 more reviewers
@christopheNan christopheNan christopheNan left review comments
@awecx awecx awecx approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@Seluj78 Seluj78

@drNymbus drNymbus

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@drNymbus @deronnax @Seluj78 @awecx @christopheNan